Merge pull request #7637 from jmcclelland/CRM-17812