[Users] GRHydro changes to be merged into trunk