Merge branch 'feature/fix-empty-domain-error' into develop
Merge remote branch 'hubx/master' into develop