Merge pull request #7324 from kcristiano/CRM16408