Patch up to 3.4.25