Fix for Bug NMS-5806