Merge branch 'kk/maint-commit-tree' into maint