Merge pull request #4812 from colemanw/CRM-15495