Fix for the enhancement NMS-5705
Merge remote-tracking branch 'origin/1.10'