Merge branch 'CRM-12133' into master-CRM-12133