Update for v1.3.6