Merge branch 'ks/rebase-no-git-foo'