merge with zqh
use a shorter sflkey in sfile
Merge remote-tracking branch 'origin/zhaoyang' into zhuqihan
merge with zhaoyang.