merge in nyc-bugfix-release history after reset to 8e1e806945c04bca625071feb15337080258e0dd