Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-update...