Imported upstream version '1.8.12' of 'upstream'