merge in nyc-mr2-release history after reset to 11a692ca262080f6007ad61ee3d0e445c650d1db