Merge pull request #10557 from seamuslee001/CRM-20769