Merge config/ changes from GCC.