Rolled version ahead of v0.4.0 development (bis)