demorollback changes from release preparation of vbranch2