Summary of changes: ca8adba... Final version of the 804792 patch. No functional changes. (*) c309580... - When retrying after main arena failure, always retry in (*) (*) This commit already existed in another branch; no separate mail sent