created:
https://jira.springsource.org/browse/XD-1043
https://jira.springsource.org/browse/XD-1044