Merge branch 'bp/untracked-cache-noflush'