Merge branch 'cb/uname-in-untracked'