fix some bugs
commit again
Merge remote-tracking branch 'origin/release' into zhangjc
merge from origin/release