Merge branch 'maint-1.6.2' into maint * maint-1.6.2: Revert "checkout branch: prime cache-tree fully"