Cherry-pick from v0.1