Index changes for release 2
Resolved merge conflict
Notes for release 2
Merge branch 'r2_index'