Merge "Expose REBROADCAST extra"