see comments

https://issues.jboss.org/browse/JDF-355
https://issues.jboss.org/browse/JDF-353
https://issues.jboss.org/browse/JDF-352