Rebase from GCC
108 files changed