ISPN-4279

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