am 12631ec3: Merge "Start implementing concept of "running" users." into jb-mr1-dev

* commit '12631ec35eafc466e0deef315daa5fdfb5066372':
  Start implementing concept of "running" users.