Merge "Fix CDM string to say Allow instead of Set" into sc-dev