Merge "Fix CDM package check"