Merged v0.9.8