Merge pull request #5338 from kurund/CRM-15756