Updating to latest upstream commits