Merge "More multi-user stuff." into jb-mr1-dev