Imported upstream version '1.10.12' of 'upstream'