Merge branch 'net-introduce-and-use-route-hint'