JBOSS-20:
PFUS-20: readded dissappeared patch
JBOSS-20:
PFUS-20: upped revision