Merge pull request #9546 from PalanteJon/CRM-19782