Merge tag 'v1.8.4-rc2' into debian-sid