Imported upstream version '1.8.16' of 'upstream'