Imported upstream version '1.12.10' of 'upstream'