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