Changelog: 6609 -