CRM-13198
Merge pull request #1507 from yashodha/CRM-13198

CRM-13198