Support v0.10 through v0.11.13