Merge "Minor refactors." into jb-mr1-dev