Merge "Protect history broadcast" into rvc-dev