Merge pull request #11961 from colemanw/CRM-21843