Prepare for v3.5