Merge pull request #6304 from JeroenED/bugfix/utzer-bug