merge in nyc-bugfix-release history after reset to 9141ee6a00b57f891fe718b42c5fd34d25e7d0e5