Fixed NMS-5904

Fixed a typo!
Merge branch '1.12'