Fix for Bug NMS-5348