Merge pull request #6361 from colemanw/CRM-14136