Merge branch 'rs/fmt-merge-msg-leakfix'