https://issues.jboss.org/browse/SRAMP-513

https://issues.jboss.org/browse/DTGOV-173