Merge pull request #6569 from seamuslee001/CRM-17066