Fix to issue U4-5758. Branched off from 7.2.0