Merge "Add new failsafe to disable new archiving broadcast" into main