Pull request for SPR-10658

Test project for https://jira.springsource.org/browse/SPR-10658