Merge pull request #7794 from PalanteJon/CRM-17029-4.7