Patch against 3.1.2 to modify the state machine for extended life