Merge "Fix domain collection for wildcards" into sc-dev