Import patch patch-2.4.18-pre9-rc1