Merge branch 'rh/mergetool-regression-fix'