Update to v0.8.5