Merge tag 'v2.24.0' into debian-sid