Fix NMS-5894: add a call to getNodeType() before comparing names
Merge remote-tracking branch 'origin/1.10' into 1.12