fix gdao
fix and move test
Merge origin/master
Merge origin/master
validate pawd
have fun