Merge pull request #3608 from kurund/CRM-14877