Merge pull request #2521 from kurund/CRM-14181