HHH-5932 Test and fix on 4.3

Same as PR #804, rebased on branch 4.3.