[#64154500] state machine changes 1