Merge pull request #10727 from JMAConsulting/CRM-20947