Import patch patch-2.4.18-rc1-rc2