Update for v0.16.5