Merge pull request #2860 from lewurm/fix-cfgdump-related-stuff