applied patch for CRM-12673