Merge "Coupl'a fixes related to broadcast dispatcher" into rvc-dev