[jboss-jira] [JBoss JIRA] (AS7-5384) Apply AS7-5373 fix to master