[MERGE] Next batch of improvements/fixes for mail.alias