Merge branch 'feature/git-mk-skip-tracked-gitignore' into t