Apply patch from https://issues.apache.org/jira/browse/DELTASPIKE-473