Merge pull request #4659 from kurund/CRM-15684