CRM-12425, merged #792