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