Prepare domain
Merge branch 'config' into develop