Merge "Add smoothing to jerk calculations and updated jerk thresholds." into main