Merge branch 'cc/untracked'