Merge branch 'nd/commit-tree-constness'