demorollback changes from release preparation of vmaster