Rtgov 464

https://issues.jboss.org/browse/RTGOV-464