ssssrollback changes from release preparation of amv