Update to v3.25