Added official PR. It is the same as https://issues.jboss.org/browse/RHMAP-16177 and https://issues.jboss.org/browse/RHMAP-16179