Add support for not removing the default domain1 domain.
Merge branch 'feature/fix-35' into develop