Merge branch 'feature/fleeSpeed' into develop