Merge branch 'rr/complete-difftool' into next