FNAL version of CERN psi46test/master