Merge branch 'nd/cache-tree-ita' into maint