Merge from vendor branch GCC: