merge changhw01/taiwanuxd-dev into refactory