merge in nyc-mr2-release history after reset to 627e2b532f97083cd53b889b20e68b785a5238e8