Merge debugger work into mainline