Merge branch 'nd/fix-untracked-cache-invalidation'