Merge branch 'jk/mergetool-lib-refactor'