Merge branch 'index-scope'