testrollback changes from release preparation of 1.1.1