Merge pull request #11413 from seamuslee001/CRM-21534-29