Merge new FSM to Master