Merge branch 'an/diff-index-doc'