Merge pull request #9303 from tschuettler/CRM-19550