Merge pull request #4452 from yashodha/CRM-15445