Merge pull request #7201 from JMAConsulting/CRM-17569