Crm 15701 qa fixes