Merge "Add corresponding code for the new NR condition" into rvc-dev