merge in nyc-mr1-release history after reset to 1988cd35edacdec4b17206839bb72e5db473ad94