Fix for enhancements NMS-5962 and NMS-5963