Merge branch 'ss/mergetools-tortoise'