Latest upstream source 4.5.0