Merge "Enforce a user limit" into jb-mr1-dev