Merge branch 'al/mergetool-printf-fix'