Merge "Allow "_" in URIs"