[MERGE] crm: fix for bug 877978