Merge from RAMA