Import of v0.0.69