Merge "Remove exclusivity restriction of multiple preferences" into sc-dev