Don't compute velocity if not needed
Merge pull request #2637 from fredj/kinetic-optim

Don't compute velocity if not needed