v0.8.0 = OC6 friendly