Resolve #3224699 "General code fixes"

kosa ilmarequested to merge
issue/exception_mailer-3224699:3224699-general-code-fixes into 8.x-3.x

Closes #3224699

Merge request reports