Escape the domain value to avoid problematic paths
Merge remote-tracking branch 'chiiph/bug/escape_domain' into develop