Updated CHANGES.txt after cherry-picking fixes from the master branch