Improve debug support
Merge branch '1.1'