This is a follow-on from #16176. The changes made in that issue are also applicable to `spring-boot-starter-webflux` as well.