fix for NMS-6950
Merge branch 'rc/stable/1.14.0' into jira/NMS-6950
Merge branch 'jira/NMS-6950' into rc/stable/1.14.0