Fixed NMS-5904
Merge branch '1.12'