Merge branch 'ip_gre-flags-update'