ISPN-4332 + ISPN-4331

https://issues.jboss.org/browse/ISPN-4331
https://issues.jboss.org/browse/ISPN-4332