Merge pull request #6513 from phadej/changelog-3.2