Merge from Upstream and Email Multi-Site

Merge from Upstream and Email Multi-Site