Merge pull request #8959 from andrew-cormick-dockery/CRM-19283