Merge pull request #11447 from seamuslee001/CRM-21591