YCB-94 :Fixed;
YCB-102:Fixed.
Merge pull request #220 in YIN/basic from bugfix/YCB-94-hot to develop

# By haoxiangchen
# Via haoxiangchen
* commit '604b02f28d886db44f5ba4993ca3b1b28bbb1c0c':
  YCB-94 :Fixed; YCB-102:Fixed.