Merge tag 'v1.8.4.4' into debian-sid