Merge "Add Contrail input"