Merge branch 'domain_support' into integration_branch