Final commit for v0.9.10