Update to 2.3.25-4