This commit adapts the fix for SPR-14597 commited to spring-webmvc to the spring-web-reactive module. Issue: SPR-14597