Pull gnn@ changes to allow the 2000 series to work with this driver