Merge branch 'jc/mktree' into sb/opt-filename