Merge branch 'ipv6-expired-routes'