Merge branch 'feature/digest-email' into 'develop'