latest sources from upstream source 4.6.1