Merge Merge_Resv-RR to master