[#58059330]Adding comment functionality
Merge 58059330-mailing-activation to master

[Completes #58059330]