Merge pull request #5609 from PalanteJon/CRM-16196-46