Merge branch 'ab/retire-option-argument' into da/difftool