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