[#43120355] Email digest: refactored into two separate digests
Merge branch 'staging' into production