Maintenance update
Last commit before working on campaign_refactoring