Merge pull request #6708 from seamuslee001/CRM-14599