Merge pull request #1196 from yashodha/4.3.CRM-13046