Merge "main/cdr: Allow setting properties on a finalized CDR if it is the last one"