Merge "Fix CDM association filtering" into sc-dev