Fix for Bug NMS-5892