Merged with 0.9.