Merge "Remove hostIP and port from baseURL"