Imported upstream version '1.9.47' of 'upstream'