Merge pull request #5097 from PalanteJon/CRM-15917