After an evade they will return to the spawn position correctly (cherry picked from commit ef5e1d72bea4e36d21137e65ad69a79a8246dbc1)
After an evade they will return to the spawn position correctly (cherry picked from commit ef5e1d72bea4e36d21137e65ad69a79a8246dbc1)