Merge pull request #10479 from tschuettler/CRM-20694