Merge pull request #6546 from colemanw/CRM-17059