Fix to issue U4-5758. Branched off from 7.2.0
Merge pull request #541 from jforage/issue-U4-5758

Fix to issue U4-5758. Branched off from 7.2.0