Merge "Revert "[CDM] Add CompanionExemptionProcessor"" into main