v3.6

Velocity and cheetah compatibility