See also https://issues.jboss.org/browse/ISPN-3162