NMS-6860: Fix merge conflict from jira/NMS-6860-1.12 into origin/jira/NMS-6860-1.14