Crm 11983

did changes as per specd in CRM-11983