Merge "Reorder Broadcast checks" into sc-dev