Changelog: Copy over from 6.2