Missing import.
Merge branch '0.12.x'