Merge from ndis_wip_22102004 branch: