Merge "More mult-user API work." into jb-mr1-dev