Update for v1.13