(OSD BRANCH) unified debugger update