CPM removed extra div
Merge remote-tracking branch 'origin/69.1-marketing-campaigns' into UAT
resolved conflicts