Merge "Fix CDM profiles string template use" into sc-dev