I've created HHH-9718 to fix in 4.2 and 4.3.

I'm OK with you closing jira issues after fixing only in 5.0.0 when the approach is different in that version. Please remove the 4.2 and 4.3 fix versions; otherwise, I will think that it is fixed there.

Also, please clone the issue for fixing in 4.2 and 4.3 branches so I don't lose track.