https://issues.jboss.org/browse/JBTM-1743
https://issues.jboss.org/browse/JBTM-726