vdfvdfrollback changes from release preparation of vdfvdfvdf