Merge pull request #8233 from PalanteJon/CRM-18468