Merge branch 'debug-0.13' into HEAD