Merge pull request #15438 from demeritcowboy/emailprocessor-still-hungry-alt