merge in nyc-mr1-release history after reset to c1f3197fc6ce4f5d62d8fb6d74344bb157f57516