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