NMS-6689: first revision