Merge branch 'git-fs-initing'