Merge pull request #1370 from TheBlueMatt/2022-03-pref-first-hop-chans