Merge pull request #9857 from aydun/CRM-19464