Portal domain fix

Pantelis Malekasrequested to merge
portal-domain-fix into develop

Merge request reports