[T-1419] Update CC fields on form

Merged Facundo Barral requested to merge T-1419 into 12.0-stage

Merge request reports