Add debugger compat
Merge from origin