Wildfly compensation issues (5_BRANCH)