Merge branches 'fix/ssl-url' and 'fix/subdomains'