ertrollback changes from release preparation of erf