Fix for dates and etoc mailings
Adding comment
Merge branch 'dev/etocs' into release/2.7.2rc