Merge pull request #10476 from chrisfromredfin/CRM-20690