merge in nyc-mr2-release history after reset to ad00cbcf938478ba990e66a5fa4532fcca7be485