fengli bugfix merge