Merge pull request #11226 from seamuslee001/CRM-21378