dffrollback changes from release preparation of 1