Merge "Use bugfix flag for archived broadcast extras" into main