This is a continuation of https://github.com/spring-projects/spring-framework/pull/25261

Comment From: stsypanov

Any reviews?