Issue #3333360: Resolve MR conflicts between 1.09 and 1.10 of #1 MR, original MR - @see !1
Closes #3333360