CRM-13184 - Code Merge

Fixed code merge issues.