Merge branch 'nexthop-various-fixes'