Merge pull request #21737 from demeritcowboy/standalone-case-email