Merge "Fix handling of URIs with subId"