Basically filing this here to crossref: https://github.com/spring-projects/spring-boot/issues/36506 based on suggestion there.