Imported upstream version '1.7.17' of 'upstream'