Merge pull request #1520 from kurund/CRM-13282