Fix for enhancement NMS-5884