Imported upstream version '2.4.16' of 'upstream'