fsm: rename struct member
Merge branch 'fsm-struct-rename-member'
fsm: add new function
Merge branch 'fsm-add-function'