Merge "More protected broadcasts!" into nyc-dev