Fix for Bug NMS-6070