backport v0.11