Merge pull request #10481 from seanmadsen/CRM-20698