Fix: Issue with having standard http or https ports in url (:80 or :443)
Merge branch 'master' into pr/535
Removed single-use function.