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