Merge pull request #10720 from seanmadsen/CRM-20821_CRM-20938