Merge pull request #11786 from seamuslee001/CRM-21835