merge in nyc-mr2-release history after reset to e6e89f99d2d254be117eaea7d1eeaf68934ef734