Merge branch 'ipv4-Enable-support-for-IPv6-gateway-with-IPv4-routes'