Conflict
Merge remote-tracking branch 'origin/69.1-marketing-campaigns' into uat
Merge remote-tracking branch 'origin/69.1-marketing-campaigns' into uat
Resolved conflict in common functions