T 3020

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