Issue 21374: Fixed merge conflict with 1-4-3 code