Changelog: 4897 -