merge in nyc-bugfix-release history after reset to 04d5089e33301514b98a591db10d1a013d87a94d