Update fork with latest changes

Updates fork with the latest changes from upstream repository.