Merge v0.9.11