domain hotfix for production
Merge branch 'domain-hotfix'