CRM-12463
Merge pull request #631 from yashodha/soft

CRM-12463