ddddrollback changes from release preparation of ssssss