merge in nyc-bugfix-release history after reset to 5ec17d968e8027c2e2ac468742443f1ce650b3ee