Merge branch 'bc/mailsplit-cr-at-eol' into next