Changelog: 7787 -