Crm 14220 & CRM-14419 api enotice fix & extra param