-- fixed for CRM-12127, for api fixes