Fix for Bug NMS-5348
Merge remote-tracking branch 'origin/1.10' into 1.12