Use state for the last_optimize value.
Merge branch 'state' into commitwithin