[master] Depricated passage finder finally replaced with the new one