Merge v0.9.10