This is the DS issue: https://issues.apache.org/jira/browse/DELTASPIKE-719
Also related: https://issues.apache.org/jira/browse/DELTASPIKE-718, https://issues.apache.org/jira/browse/DELTASPIKE-720