Merge pull request #6140 from colemanw/CRM-16643