hhrollback changes from release preparation of 1.0