Merge from Ponce