Merge branch 'nd/untracked-cache' into next