Merge pull request #3865 from PalanteJon/CRM-14584