Update for v1.9.6