Merge "Start implementing concept of "running" users." into jb-mr1-dev