add https://jira.springsource.org/browse/SPR-11415