backport changes in pull request #1037 to 2.2.eap5 branch for JBPAPP-11049.
Merge pull request #1598 from soul2zimate/JBPAPP-11049-2.2.eap5

backport changes in pull request #1037 to 2.2.eap5 branch for JBPAPP-11049