Merge pull request #1267 from yashodha/4.4.CRM-12849