Merge pull request #10796 from tschuettler/CRM-20995