Reduce velocity multiplier
resolved conflicts
Merge branch 'reduce-velocity-multiplier'

* reduce-velocity-multiplier:
  Reduce velocity multiplier
resolved conflicts
Merge branch 'reduce-velocity-multiplier'

* reduce-velocity-multiplier:
  resolved conflicts