Merge branch 'cb/builtin-merge-format-string-fix'