no change
Merge remote-tracking branch 'origin/Develop' into Develop

Conflicts:
	velocity.log
Adjusted CV calcs to be based on the new CVObject