This is a continuation of https://github.com/spring-projects/spring-framework/commit/874574513c47287d86fb8a3e943a81910b587395