Changelog: 4709 -