tracks changes in issue 4322

[fixes/tracks 4322]