More prep for v3.10.0