Updated for v34.0.5