Merge branch 'CRM-20460' into CRM-20460-4.7