Ispn 3355

https://issues.jboss.org/browse/ISPN-3355

Please don't integrate yet.