Merge pull request #775 from kurund/CRM-12631