Merge branch 'jc/update-index-doc'