Changelog: 4570 -