Merge branch '2022-02-fix-multi-hop-hint-panic' into 2022-02-0.0.105-sec