Merge upstream 0.6.3
Merge 0.6.3