Rebase from GCC
47 files changed