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