https://jira.springsource.org/browse/XD-1010