Import patch patch-2.4.18-pre8-pre9