Changelog: 4673 -