Merge "Improved logging." into nyc-mr1-dev