Merge branch 'zdf'(fixes #8024)