DEV branch commit test
domain check fix
Merge branch 'dev-env' into test-env