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