Merge branch 'rs/fmt-merge-msg-string-leak-fix'