Jira/nms 5182

test DO NOT MERGE