Changes for v0.9.9.18