Merge "Set N-MR1 to version 7.1.1." into nyc-mr1-dev