Merge "Improve multi-user broadcasts." into jb-mr1-dev