Merge "Add registering for explicit users." into jb-mr1-dev