merges upstream commits

merges upstream commits