Merge upstream 0.9.1