Merge tag 'v1.7.10-rc4' into debian-experimental