Merge "DO NOT MERGE add a part for NR to fix cts issues" into pie-cts-dev