Fix for Enhancement NMS-5893