Update to consolidate 0.10.0