Merge branch 'rv/maint-index-commit' into maint