Changelog: 6665 -