Up to v3.5.0