merge from gcc