Imported upstream version '2.4.7' of 'upstream'
Overlaid patches from 'hydro'