Merge from GCC: