SPR-10500

Please refer https://jira.spring.io/browse/SPR-10500.