Feature/gre ipv6

Replicate pull request #570 in new develop