Merge "Various updates and fixes" into nyc-mr1-dev