Merge branch 'nexthop_exceptions'