Merge pull request #815 from kurund/CRM-12466