Merge pull request #5839 from seamuslee001/CRM-9764-4-6