Merge branch 'fc/do-not-use-the-index-in-add-to-index' into maint