Merge mailing and general fixes into branded branch