Rolled to v0.4.0