Patch resolving NMS-6924 for develop branch