Rolled version ahead of v0.8.0 development