merge in nyc-bugfix-release history after reset to 9ab2cd612d72d4f4e8e0e303d2995f77b1f6cc1a