potential fix for NMS-5922
Merge remote-tracking branch 'origin/1.10' into 1.12
Merge branch '1.12'