merge in nyc-bugfix-release history after reset to 739497a10c3e143823ecba75e3539ab3ac084305