Merge branch 'ct/prompt-untracked-fix'