v239-40
37f25766 · core: make sure to restore the control command id, too ·