merge in nyc-bugfix-release history after reset to 6db92d932f4b5f6a8b36bef9a292486c9b3e9277