Merge pull request #2082 from kurund/CRM-13824