Merge "Various fixes." into jb-mr1-dev