Import patch patch-2.4.18-rc4-final