Merge pull request #6444 from PalanteJon/CRM-16981