CRM-10206
Merge pull request #4276 from yashodha/CRM-10206

CRM-10206