Imported upstream version '3.3.4' of 'upstream'