89d4fa99484f098078634845b7c2d793905f2d8c fixes 4.2 and b943525c80b411c9fa1f66b44f8a5b14f928bf34 fixes 4.3 for this issue. I mistakenly pushed these commits for HHH-9388.