Imported upstream version '1.12.0' of 'upstream'