Changelog: 6946 -