Merge pull request #7499 from seamuslee001/CRM-17754