Merge changes I33aa2968,I3e9bbcc8 into whx

* changes:
  controller_adjust
  follow+sendMessage