Merge "Don't assume host is wildcard if not provided" into rvc-dev