Re: fsm4 branch and handover_test.c