Merge branch 'develop' into 'docs/improve-mailer-settings-desc'