added schanges for 2nd release
resolve merge conflict
added final changes fro 2nd release
Merge branch 'r2_index'