Merge pull request #11345 from saurabh6790/setup_wiz_fixes

[HOTFIX] translate domain