Merge back changes from Broadcaster official repo