Update for v0.8.19