Updated for upstream v0.10.20