merge from ras2