Merge "RESTRICT AUTOMERGE Fix CDM package check" into rvc-dev