Merge pull request #13725 from JMAConsulting/CRM-21754-rc