Merge "Support generic profile types" into sc-dev