https://issues.jboss.org/browse/JBTM-1602
https://issues.jboss.org/browse/JBTM-1605