Merge "Fix recovery mode."