fixes
Merge branch 'support-google-hosted-domain'