Update fork with upstream commits