Merge pull request #10195 from seanmadsen/CRM-20453