missing commit from nms auto-addition fixes, RT#15536