Merge branch 'ss/mergetool--lib'