Merge pull request #2605 from kurund/CRM-14201