Update for v3.7.0