The following commits should have been pushed for HHH-9461: 89d4fa99484f098078634845b7c2d793905f2d8c (4.2) and b943525c80b411c9fa1f66b44f8a5b14f928bf34 (4.3). I mistakenly pushed these commits for this issue.