Rolled version ahead of v0.6.0 development