Merge "Restrict alarm broadcast" into sc-dev