3.0.35 -> 3.0.58 patching up