Dtgov 176

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