Merge branch 'fc/mergetools-vimdiff3'