Fix for Enhancement NMS-5933