Merge pull request #11129 from seamuslee001/CRM-21306