Merge "More multi-user methods in PM" into jb-mr1-dev