Merge "Fix domain verification CATEGORY_DEFAULT check" into sc-dev