Merge pull request #2259 from kurund/CRM-13982