Merge "Miscellaneous cleanup" into jb-mr2-dev