merge in nyc-preview-release history after reset to dedeff64279b77bafff72b6d866efc93e829b4ab