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