Merge pull request #5382 from kumpera/pedump_fix