Applied updates for v0.9.0