[FIX] Calculation of packages

Merged Santiago Said requested to merge OverrideCalculationOfPackagesForCot into 7.0-stage

Merge request reports