Merge "Remove merged formatting logic." into jb-ub-mail