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