Merge tag 'v2.17.1' into debian-sid