merge from gcc: