we def need to revisit this... created JIRA  - https://jira.spring.io/browse/XD-1517