18 Commits (feature/velocity_control)