Merge branch 'jt/cache-tree-avoid-lazy-fetch-during-merge'