Merge branch 'sp/mergetool'