fix for NMS-6214 (duh)
Merge branch 'master' into pjsm/2.0
Merge branch 'master' into pjsm/2.0