Merge branch 'br/commit-tree-parseopt'