manifest: Update to r3.1 & track recovery.