CHG: Preparations for Geant4 10.0