Merge "Less verbose logging, lots of references." into jb-mr1-dev