V2 cart state and stop_lock support