sync changelog with gcc, plus commit the following patch: