Changelog: 7505 -