NMS-5232 fix 127.0.0.1 on events which should be null
Merge remote-tracking branch 'origin/1.10' into 1.12