ISPN-4557

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