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