Merge "main/cdr: Allow modules to modify CDR fields before dispatching them"