fix zsstest test fail issues
Merge branch 'origin/3.0'