Merge pull request #9339 from kumpera/better_debugging_p1