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