Merge branch 'jg/mergetool'