merge in nyc-mr2-release history after reset to 1a5fdccc6d10acc50911b98a52ea2d3931154fef