Merge "Finish this bit before I forget." into jb-mr1-dev