Merge branch 'rr/mergetool-temporary-filename-tweak' into pu