v0.9 Merge