Merge pull request #11026 from JMAConsulting/CRM-21201-fix