Code

Merge branch 'sc/difftool-skip'