Initial patch here:
https://github.com/pedroigor/wildfly/commit/e2f1ae5810402ec2876b4f55fc665b8d1d23c3a6
Need to check with WildFly Team if it is fine.