Changelog: 4372 -