Merge pull request #9029 from kcristiano/CRM-19279