Merge pull request #8491 from seamuslee001/CRM-18752