Bring the Master branch up-to-date with NMS