See also: https://jira.spring.io/browse/XD-1717