Merge pull request #6134 from colemanw/CRM-16584