Merge branch 'nd/invalidate-i-t-a-cache-tree' into maint