Merge changes in v0.8.9a from official repository.