new agilent supply control and clients
fixed merge