Handling empty host in URLs
Merge branch '47-security-fixes'
Rolled back changes for empty host in URLs
Merge branch '47-security-fixes'