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