Domain should be null for dev and testing.
Merge branch 'master' into example