Merge pull request #10166 from aydun/CRM-19464-upgrade