Merge branch 'br/mergetools-guiffy'