Merge tag 'v2.38.1' into debian-sid