custom_domains is optional
Merge branch 'updated2' into gb_master