bug fix in master branch
resolve merge conflict
added GiGi in branch r2_index