Mailing list tweaks
Merge branch 'mailing-list' into staging2