Merge "Fix URLs when running with tls-proxy enabled"