Merge pull request #3333 from kurund/CRM-14476