merge in nyc-mr2-release history after reset to 189e63df8681345b82b0a71b625a62face1b3b4e