Merge "Add NMS broadcasts to protected list" into sc-dev