Integration of navset2 to ddk 2 rc1