Merge tag 'v2.25.0' into debian-sid