Merge upstream

The merge-upstream branch should be deleted