Merge pull request #9135 from tschuettler/CRM-19424