CRM-13863 - Improve workflow with container sets (custom fields/prices/profiles)