https://jira.spring.io/browse/SPR-12329