Bring the v0.13.2 solutions to the v1.0