Merge pull request #7792 from seamuslee001/CRM-18021