Add state machine
Release v2.4.16