WFLY-510 Applying changes suggested in PR review. Squash it before merge