Merge branch 'sg/complete-untracked-filter'