Merge pull request #7033 from colemanw/CRM-13823-2