Merge pull request #4346 from colemanw/CRM-15443