Changelog: 4676 -