Crm 12689 fixes

NOTE: this fix includes handling of 'addition to' recipients without  its 'is_repeat'  handling.

Going to send a seperate PR for 'is_repeat' and 'addition to' handling.