Merge changes I655ac0a7,I82858c6a

* changes:
  feat: allow FFA_RUN as return from Waiting state
  refactor: rename FFA_MSG_RUN to FFA_RUN