Merge remote-tracking branch 'origin/pr/752' into wh_low_speed_limit