Merge pull request #3288 from kurund/CRM-14454