Merge tag 'v2.29.1' into debian-sid