Merge branch 'contrail' into v7.0