Initial merge from Contrail repo