Merge pull request #10990 from seamuslee001/CRM-21006