Import patch patch-2.4.19-pre1