Merge "Address CDM API feedback" into sc-dev