Merge pull request #9797 from seamuslee001/CRM-19979