Merge "Propagate callingPackage explicitly within CDM" into rvc-qpr-dev