Merge branch 'mm58_dashboard' of gitlab.com:m01sl/m01mailer into mm58_dashboard