Merge pull request #7581 from seamuslee001/CRM-17802-further