addition by r2_index team
resolve merge conflict
r2_index completed
Merge branch 'r2_index'