ISPN-4111

https://issues.jboss.org/browse/ISPN-4111