Merge pull request #5363 from colemanw/CRM-16093