Debug, dump improvements
Dump, detailed fix
Merge pull request #2675 from mruz/2.0.0_dump

Debug, dump improvements