Merge pull request #1488 from kurund/CRM-13256