Fix for Bug NMS-6074