Merge pull request #3253 from kurund/CRM-14473