crm-10164 : more fixes
Merge pull request #1058 from pratik-joshi/crm-10164

crm-10164 : more fixes