CRM-13841 - Load Group Org before save