Ispn 4153

https://issues.jboss.org/browse/ISPN-4153

https://issues.jboss.org/browse/ISPN-4168