Merge tag 'v2.40.1' into debian-sid