Latest upstream source 4.4.0