Previously this had a few issues when using non-standard ports for HTTP(S) Reviewed-on: #2099 Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com> Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>