Merge upstream 0.6.3