Pull request for SPR 10440

https://jira.springsource.org/browse/SPR-10440