Ispn 4820

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