Merge "Fix broken broadcast options key in test" into sc-dev