Renaud

Manufacturing merge.