Merge branch 'rs/absorb-git-dir-simplify'