Initial commit of R2_Select branch
resolve merge conflict
Merge branch 'r2_select'