3.0.30 -> 3.0.35 patching up