Merge pull request #4184 from colemanw/CRM-15335