HOPKINS: Fix bug #3611942 and #3613072 - Pathfinding regression in 1fd81eee4056342971220240a49baef73737b386