merge in nyc-bugfix-release history after reset to 51b23ccc575bcc31b68e97f71089636d551e9a25