Merge "N-DR/N-MR1 is 7.1" into nyc-mr1-dev