Merge branch 'ipv6-blackhole-route-fix'