Pls note that this change comes from WFLY-237-239 PR commit, I made WFLY-238 PR on top of it as mentioned on the comment, so my guess is that changes from the previous commit should perhaps be discussed on the old PR.