acu161341 added binstubs, etc.