merge latest source commits into vendor tree

merged all relevant commits