Merge pull request #5719 from PalanteJon/CRM-16403