Fix for Bug NMS-6072