CRM-13186 - Code merge