This probably should go in separate commit and backported to v0.10.