Merge "Support different user/project domain values"