#2 allow to override default domain
Merge remote-tracking branch 'origin/1_sdk_beta' into 1_sdk_beta