Merge pull request #6852 from seamuslee001/CRM-17303