Final fixes
Merge branch 'rr-mailchimpcompliance' into staging