Backport of gh-9686
Comment From: spring-projects-issues
Fixed via 0a56dc4ef50edc53899499064042ca9f4f7e3971
Comment From: spring-projects-issues
Fixed via 362855b8b83dc81058bd0d4db1c11635d580adcc
Backport of gh-9686
Comment From: spring-projects-issues
Fixed via 0a56dc4ef50edc53899499064042ca9f4f7e3971
Comment From: spring-projects-issues
Fixed via 362855b8b83dc81058bd0d4db1c11635d580adcc