NMS-5914 make service type unique
Merge remote-tracking branch 'origin/1.10' into 1.12