Merge branch 'sb/in-core-index-doc' into maint