Merge upstream 1.0.6