Merge branch 'ab/the-index-compatibility'