Merge pull request #11360 from seanmadsen/CRM-21507