Merge branch 'nd/repo-clear-keep-the-index'