addds
Merge branch '3_20_wsq' of github.com:aicike/Test into 3_20_wsq