Revert "Revert "Merge remote-tracking branch 'origin/jira/NMS-6864' into rc/stable/1.14.0""

This reverts commit 5e552a056373007ce0020e7a5e6db02a32ab24e1.
Revert "Revert "Merge remote-tracking branch 'origin/jira/NMS-6800' into rc/stable/1.14.0""

This reverts commit 974f6234dc67e120a748748d9f929f163ce57a2d.
Revert "bump to 1.15.0 in develop"

This reverts commit afd38dd155db97a7fe9ed06c6ff54eeed935b049.