fixes #6703 bypass default domain check
Merge branch 'dev' into test
Merge branch 'test' into prod