Merge from gcc