Merge branch 'kw/commit-keep-index-when-pre-commit-is-not-run'