Merge pull request #10991 from seamuslee001/CRM-21011