Merge branch 'ipv6_route_sharing'